Merge pull request #149 from Tucos/cipherkeys