changed something
Merge pull request #389 from rjynn/master

changed something