Merge pull request #4 from Edzelopez/GEP-51

GEP-51 --more work done on extension
GEP-51 --more work done on extension