Fixes
Merge pull request #39 from apeniche/master

Fixes