Changes to wording and deafult values.
Merge branch 'master' of github.com:NCPP/NCPP