Changes for SMS in v2.1
Changes from pull request 551
Merge pull request #551 from owdqa/bug/fix_sms_v2.1

Changes for SMS in v2.1