Merge pull request #3 from Edzelopez/GEP-51

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