typos in macro conditions removed #59