GEP-6 Bug fixes
Merge pull request #15 from Edzelopez/GEP-6

GEP-6 Bug fixes