Update some of the descriptions
Merge pull request #4 from Mire/master

Update some of the descriptions