Merge pull request #38 from Edzelopez/GEP-19

GEP-25 Worked on bug fixes
GEP-25 Bug fixes