fix errors in And and Or code
Merge pull request #17 from smichr/boolargs

fix errors in And and Or code