Add some comments in the source code.
Merge branch 'beta'