Fixed an issue with legend entry selection. Fixed issue #126.
Merge branch 'master' into release-2.0