GEP-39 Bug fixes
Merge pull request #62 from Edzelopez/GEP-19

GEP-39 Bug fixes