Add colour for new macrostep feature
Merge pull request #103 from georgek/macrostep

Add colour for new macrostep feature
Merge branch 'master' into working