Issue 114

I don't know why the tests are failing here and into issue 113 too.. I think I based on a bad master rev....