Merge pull request #50 from Ysnir/master

Merge pull request #15 from Porquepix/master
Merge pull request #16 from Porquepix/master

Merge pull request #50 from Ysnir/master