Merge pantrools v3
This branch should merge the 3.1 changes into the ongoing changes of pantools_v3 and put those together in the master branch.
This branch should merge the 3.1 changes into the ongoing changes of pantools_v3 and put those together in the master branch.