GEP-35 bug fixes
Merge pull request #55 from Edzelopez/GEP-19

GEP-35 bug fixes