Updated commenting
Merge pull request #112 from gavia/master

Updated commenting