fixing some minor issues
Merge pull request #1 from sebprunier/master

Fixing some minor issues