Added Readme
Replaced macro by functions