Partial fix/replica code refactor
Merge branch 'master' of github.com:Fist/bft