Merge pull request #36 from Porquepix/master

Merge pull request #73 from Ysnir/master
Merge pull request #74 from Ysnir/master

Merge pull request #36 from Porquepix/master