Fix
Merge pull request #18 from gibello/master

Fix