* revert #49
+ dev (v0.4.0)
Merge branch 'master' into dev
* v0.4.1