cleanup
plotting refactor
plotting refactor
Merge branch '0.3.0' into 0.3.0-tests