SMS Support

Merging SMS support into master branch