Merge pull request #13 from sinagaboni/master

request terahir
Merge pull request #34 from alfahmi55/master

Merge pull request #13 from sinagaboni/master