Merge pull request #23 from Porquepix/master

Merge pull request #60 from Ysnir/master
Merge pull request #61 from Ysnir/master

Merge pull request #23 from Porquepix/master