Merge pull request #82 from JaapKeuter/nonce_alignment

Thanks for the contribution.