Merge branch 'master' into ns-interactions-init
basic script inclusion
minimal script updates
Merge branch 'ns-interactions-init'