Updated directives
Merge branch 'master' of http://github.com/ptal/nominal-workbench