Merge pull request #563 from danvk/fix-plotter