Plotting

Closed Theo Steininger requested to merge plotting into master