Hopefully fix #11
Merge pull request #19 from eliadil/master

Fix #11