Merge pull request #13 from publicis-indonesia/master

Sync "development" branch with v0.3.1
Merge pull request #14 from publicis-indonesia/development

Merge pull request #13 from publicis-indonesia/master