Merge pull request #121 from mamarley/unusedcipherfix