Merge pull request #78 from Edzelopez/GEP-53

GEP-53 bug fixes
GEP-53