master
Fixed macro bugs