Adding comments to the code.
Merge branch 'replication'