Merge pull request #54 from Ysnir/master

Merge pull request #19 from Porquepix/master