More plotting settings
More plotting settings
Merge branch 'develop'