added curve25519 and merge with master