0.4.0, close #17
Merge branch '0.4'