Added SMS bit.
Merge branch 'develop'