Merge pull request #637 from stweil/fixes