Merge branch 'add-graphing'
Merge branch 'master' into add-graphing