Fixes in toolkit for sms and execution
Merge pull request #453 from owdqa/bug/fixes_for_sms

Fixes in toolkit for sms and execution