Tom's Dec 25 edits
Merge branch 'master' of github.com:sternSargentRA/pyTM