VB-5 More work done on extension
Merge pull request #10 from Edzelopez/VB-5

VB-5 More work done on extension