Merge pull request #46 from Ysnir/master

Merge pull request #11 from Porquepix/master
Merge pull request #12 from Porquepix/master

Merge pull request #46 from Ysnir/master