stuff and stuff
Merge pull request #36 from WClement/master

stuff and stuff