Merge pull request #55 from Ysnir/master

Merge pull request #20 from Porquepix/master
Merge pull request #21 from Porquepix/master

Merge pull request #55 from Ysnir/master