MRG-6 Customizations as per db
Merge pull request #31 from Edzelopez/MRG-6

MRG-6 Customizations as per db