refactor 0.1.4