Formatted to MY code style
Merge branch 'master' of github.com:iMartyn/compaxion