Tom's first Dec 21 revisions
Merge branch 'master' of github.com:sternSargentRA/pyTM