Merge pull request #20 from Porquepix/master

Merge pull request #54 from Ysnir/master
Merge pull request #55 from Ysnir/master

Merge pull request #20 from Porquepix/master