Merge pull request #132 from davidvossel/master

regression test failure fixes