Fixes
Merge pull request #22 from apeniche/master

Fixes