Tests complete
Merge pull request #22 from wscherphof/v0.1.1

Tests complete