VB-5 --more work on extension
Merge pull request #11 from Edzelopez/VB-5

VB-5 --more work on extension