Merge pull request #2 from lengkaka/develop

Develop
Merge pull request #3 from lengkaka/master

Merge pull request #2 from lengkaka/develop