Added macros
Updated README