Modifications/fixes after code merge
Merge branch 'development' of https://github.com/TGenNorth/nasp into development