Merge pull request #71 from WClement/master

okay
Done