added a short section on macros
Merge branch 'master' into zh_CN