Merge pull request #16 from Porquepix/master

Merge pull request #50 from Ysnir/master
Merge pull request #51 from Ysnir/master

Merge pull request #16 from Porquepix/master