text change
Merge pull request #257 from mwernimont/master

text change