Merge pull request #543 from knocte/master