reorderd variables to remove warning
updated docs
Merge branch 'master' of https://github.com/mickem/nscp