A little bit of refactoring
Bump version 0.1.0