fixed for STS
Merge branch 'master' of github.com:dennisaj/sms-twitter