small fixes to directive
Merge branch 'develop' into feature/directive-fixes
small fixes to directive
Merge pull request #156 from objectpartners/feature/directive-fixes

Feature/directive fixes