Merge pull request #6 from Porquepix/master

Merge pull request #39 from Ysnir/master
Merge pull request #40 from Ysnir/master

Merge pull request #6 from Porquepix/master