Merge pull request #289 from leider/master