Changes for Johlize
Merge branch 'master' of https://github.com/nachosgrande/System-Prototype
More changes for Johlize