Refactor for unification bug fix
Merge branch 'cryptoRedo' into development