Merge pull request #1147. Fix #1146 in master
Improved the key derivation examples
Merge pull request #1151
Merge pull request #1151 in develop