Merge pull request #647 from stweil/master