issue #21 and README (tests will be broken)