Cleanup and updated toc file.
Updated version to 2.3.
Merge remote-tracking branch 'refs/remotes/Wetxius/master'