Fixes
Merge pull request #41 from apeniche/master

Fixes