Code cleanup & updates
Merge branch 'master' of https://github.com/lozano-jorge/Vapec