Fixes
Merge pull request #38 from apeniche/master

Fixes