Merge pull request #3 from ktoley/master

merge please
Merge pull request #4 from ktoley/sansmessages

Merge pull request #3 from ktoley/master