Added some tests. Needs more.
Merge branch 'release/0.0.1'