Added (case) macro
Added support for #i and #e number prefixes
Modified to reflect latest code changes