merge from simplecrypto

update to 0.6.3