Merge pull request #343 from NICTA/legend

Legend improvements
Merge remote-tracking branch 'origin/master' into legend