Merge pull request #2 from kampoengboy/master