[Fixes #7] No Macros
Merge pull request #7 from inaka/elbrujohalcon.7.suggestion__use_macros_appropr

Suggestion: Use Macros appropriately