changes for TA
Merge branch 'master' of https://github.com/mikemeding/architecture