refactor
Prepare 0.4.0 release