Merge pull request #3 from Runecat/master

stuff
Merge pull request #25 from WClement/master

Merge pull request #3 from Runecat/master