Merge pull request #30 from Edzelopez/MRG-6

MRG-6 Finishing work on extension
MRG-6 Customizations as per db