Improve macro syntax
1. Support "-" in macro names
2. Support parenthesis omitting
Merge pull request #1 from golyshevd/improve

Improve macro syntax