Merge pull request #73 from Ysnir/master

Merge pull request #35 from Porquepix/master