fixed graph issue, thanks to Marc's insight.
Merge remote-tracking branch 'origin/master'