Bug fixes
Merge pull request #3 from wcandillon/0.1.7

Bug fixes