tests AT LAST + some refactoring
Merge branch 'tests'
release v0.1.4