* Added missing comments to the code
Merge branch 'release/1.0_rc2'