Merge pull request #9 from dqkurniawan/master

Merge #6 (diki)