GEP-37 bug fixes
Merge pull request #57 from Edzelopez/GEP-19

GEP-37 bug fixes