GEP-37 Bug fixes
Merge pull request #60 from Edzelopez/GEP-19

GEP-37 Bug fixes