Small fixes.
Merge pull request #24 from lcartier/patch-6

Small fixes.