Merge pull request #1325 from madrang/CryptoToolsCtorCheck