Merge pull request #651 from stweil/fix