Merge pull request #79 from kpengboy/master