Add comments
Add test
Update descriptions
Merge pull request #3 from sanemat/feature/descriptions

Update descriptions