Fix
Merge pull request #37 from apeniche/master

Fix