initial edit
Merge pull request #2 from micheldumontier/master

Good set of edits.