Merge pull request #411 from twosigma/byu/plot

Merging after confirming `gradle check` passes
Merge remote-tracking branch 'origin/master' into byu/plot