updates before merge
Merge branch 'master' of https://github.com/tkmharris/tom_personal
updates