bug fixes with legend
Merge remote-tracking branch 'origin/master' into American-Futures