Done
Merge pull request #72 from WClement/master

Done