merge 0.6.2 from simplecrypto