added base_output param to PLotter
merge conflict
Merge branch 'master' of https://github.com/And7s/MolSim