Fix
Merge pull request #35 from apeniche/master

Fix