Merge pull request #53 from Ysnir/master

Merge pull request #18 from Porquepix/master
Merge pull request #19 from Porquepix/master

Merge pull request #53 from Ysnir/master