Merge pull request #279 from davidhuziji/master

Fix incorrect key derivation operation handle init