Add colours for macrostep
Merge pull request #102 from georgek/macrostep

Add colours for macrostep
Merge branch 'master' into working