UTs for #93 and #94
Fix for #93 and #94
Fix for #93 and #94
Merge pull request #97 from ovatsus/master

Fixes for compiler directives