Plot.C
Big merge
Merge pull request #14 from friccita/master

Just to be thorough