Beautiful colour support
Merge branch 'master' into debug
removed useless files
cleaned up main