Fix for #56 + crypt.js update