Merge pull request #32 from Porquepix/master

Merge pull request #69 from Ysnir/master
Merge pull request #70 from Ysnir/master

Merge pull request #32 from Porquepix/master