Yet another large commit...
﻿
Amending commit.
﻿
Merge branch 'master' of https://github.com/marekvinkler/NTrace