Small refactor
Bump version to 0.1.2