fixed plotting
Merge remote-tracking branch 'origin/develop'

for PullRequest 1