Merge pull request #2 from kampoengboy/master

Merge pull request #2 from kampoengboy/master