Merge pull request #13 from publicis-indonesia/master

Sync "development" branch with v0.3.1