Refactoring and more testing
0.1.6