Merge pull request #49 from Ysnir/master

Merge pull request #14 from Porquepix/master