oops, broke a test
Merge pull request #156 from lbjay/master

oops, broke a test