Merge master
Work on storage.go, startReplication etc.
Merge