refactor, add new methods
0.1.1