merge from simplecrypto