Merge pull request #25 from Porquepix/master

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

Merge pull request #25 from Porquepix/master