Refactoring
+ Srp.verifier
Merge