v0.4.0 Fix bugs
Merge remote-tracking branch 'origin/master'