Merge pull request #54 from eleme/dev

Dev
v0.4.0
Merge branch 'dev'

* dev:
  v0.4.0