change macro
Merge branch 'develop'