fixes #3 - and fixed macro chaning