Merge pull request #34 from meoooh/master

Fix #31