syncing michael's updates
Merge branch 'master' of github.com:conrad-vanl/seal-team-pt