added a new macro [issue 53]
fixed bugged max macro
Merge branch 'iss53'