Feature/#95 macro sorting

Michelle Weidlingrequested to merge
feature/#95-macro-sorting into develop

Closes #95 (closed).

Merge request reports