Changed terminal escape character to \033 instead of the GCC specific \e
Merge branch 'master' into cmake