pierre's nitpicks
Merge pull request #1 from pcarrier/master

pierre's nitpicks