Merge pull request #1 from kampoengboy/master

Merge pull request #1 from kampoengboy/master
Merge pull request #10 from tianboyand/master

Merge pull request #2 from kampoengboy/master