Merge pull request #9 from dqkurniawan/master

Merge #6 (diki)
Merge pull request #5 from agunghadhinata/master

Merge pull request #9 from dqkurniawan/master