Merge pull request #689 from stweil/master