Bug fixes
Merge pull request #22 from wcandillon/0.1.0

Bug fixes