Merge pull request #610 from stweil/master