Merge pull request #16 from Edzelopez/VB-5

VB-5 Multiple commits
VB-5 deleted unnecessary files