Version 0.1.2 - tests passing