Merge pull request #474 from knocte/master