Merge pull request #2 from lengkaka/develop

Develop to master