Refactored, improved tests
Bumped version 0.1.2