lots of commenting..:
Merge pull request #45 from dvicini/master

lots of commenting..