Final changes from last week
Merge branch 'master' of github.com:TrimBiggs/spims