Small fixes
Merge pull request #9 from lcartier/patch-2

Small fixes