Cool heap of new changes and adjustments
Merge branch 'master' of github.com:raffomania/MAVE