Rio's changes
Merge branch 'master' of github.com:EvanAgee/TSpot