Merge pull request #67 from Ysnir/master

Merge pull request #29 from Porquepix/master