Merge pull request #4 from sophokles73/fix_explicit_nonce_handling

Fix explicit nonce handling
Merge remote-tracking branch 'origin/master' into user-principal-support