less hacky 256 color support
Merge branch 'ctest'