Some comments
Merge pull request #18 from tamedro/master

more comments