Merge pull request #27 from AfiveD/master

Merge pull request #16 from agunghadhinata/master