Merge pull request #26 from Porquepix/master

Merge pull request #63 from Ysnir/master
Merge pull request #64 from Ysnir/master

Merge pull request #26 from Porquepix/master