More fixes
Merge pull request #10 from alaframboise/master

More fixes