Merge pull request #363 from ndawe/master

plotting.func improvements