Update Readme, improve macros