highly improved plotting
Merge pull request #311 from ffrensch/master

highly improved plotting