Merge From simplecrypto