Corrected things from the merge.
Merge pull request #3 from MalcolmMielle/master

Corrected things from the merge.