refactoring for 0.2.0
merging changes