Refactor 0.4

Reference #32