Minor fixes
Merge pull request #10 from yblondeau/patch-1

Minor fixes