GEP-51 --more work done on extension
Merge pull request #5 from Edzelopez/GEP-51

GEP-51 --more work done on extension