Merge pull request #1968 from thess/smstools-work