Version 0.2.0 - adding tests, refactoring