Merge pull request #102 from murrekatt/develop

Removed ugly macros.