Added Wait macro
Merge