plots were not display in correct order
Merge branch 'master' into dev