Merge pull request #34 from Porquepix/master

Merge pull request #71 from Ysnir/master
Merge pull request #72 from Ysnir/master

Merge pull request #34 from Porquepix/master