Merge pull request #5 from Porquepix/master

Claire :D !
Merge pull request #39 from Ysnir/master

Merge pull request #5 from Porquepix/master