Implemented support for asynchronous replication
Fixed merge issues