fix merge and macros
Merge pull request #39 from lifey/master

fix merge and macros
Merge remote-tracking branch 'upstream/master'