Merge pull request #32 from alex-deaconu/master

[chore] Update directives as per UI review