Merging.
Merge branch 'master' of github.com:jkcc/MuNS
Updated testing scripts.
Merge branch 'master' of github.com:jkcc/MuNS