master
Fixed macro bugs
jacket-46
Merge branch 'master' into jacket-46