Or issue 93 fix

Please consider these changes. Tests pass, and it seems to be ok.