Merge pull request #18 from pepijnve/master

Add block macros for each support diagram format