added ECDH
Fixed unit tests
merge
merge