fixes to work with master
final edits
Merge pull request #106 from amida-tech/jj-incorporating-directives

Jj incorporating directives