add merge macro
Merge pull request #4 from bendavid/master

add merge macro