Feature addmacros

added 24 commits

• c986d554...00e236bc - 23 commits from branch prototype
• dffd344a - Merge branch 'prototype' into 'Feature-addmacros'

Compare with previous version

approved this merge request

merged

mentioned in commit 3676e271

mentioned in commit 1fa52366

mentioned in merge request !53 (merged)