Merge pull request #406 from twosigma/byu/plot

Byu/plot
Merge remote-tracking branch 'origin/master' into byu/plot