Merge pull request #27 from Porquepix/master

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

Merge pull request #27 from Porquepix/master