add some macro
Merge remote-tracking branch 'origin/mac'