Merge pull request #542 from eamars/master