Improve feature according to @fideloper feedback
Merge branch 'develop' of github.com:montogeek/Vaprobash into develop