0.6.1 dev

Update from simplecrypto