Merge pull request #34 from aringlis/master

Recent updates: mostly adding additional plot functions