Merge pull request #304 from ndawe/master

Legend improvements, fix regression in plotting examples