De-SMS-ify a couple of things :-)
Merge pull request #1 from greystate/patch-1

Welcome as a contributor ;)