adjusted scripts to work with NAF2.0
Merge pull request #327 from ffrensch/master

adjusted scripts to work with NAF2.0