GEP-51 bug fixes and modifications
Merge pull request #8 from Edzelopez/GEP-51

GEP-51 bug fixes and modifications