Merge pull request #97 from langner/v1.2

Some more work on regressions