Merge pull request #300 from tobeytailor/master

Regression fixes.