Tom's Dec 24 changes
Merge branch 'master' of github.com:sternSargentRA/pyTM