Added README, removed macro fiddling