Merge pull request #6 from Runecat/master

lol
Merge pull request #37 from WClement/master

Merge pull request #6 from Runecat/master