Small fixes and suggestions
Merge pull request #8 from enormandeau/master

Thank you!