Extract the correct name for function like macros
Handle multi-dimensional array
Be a little smarter about define.
Merge pull request #53 from r-e-d/master

Merge