Merge pull request #6 from aartbik/bik

[mpact][compiler] post-commit reviewer feedback