Modified ed sms wrapper
merged with master