New version with authenticator fixes