Merge pull request #39 from Edzelopez/GEP-19

GEP-25 Bug fixes
GEP-25 Bug fixes