Fix
Merge pull request #19 from apeniche/master

Fix