Merge pull request #1 from Particular/master

Update repo with latest
Updates for NSB V5 and typo fixes. See issue #462
Merge pull request #463 from dprothero/issue-462

Updates for NSB V5 and typo fixes. See issue #462