Merge pull request #11 from sinagaboni/master

Merge pull request #27 from alfahmi55/master