Requirements added
Merge pull request #4 from Crowdedlight/development

Requirements added
Merge pull request #6 from vikinghug/development

Development
Merge pull request #1 from vikinghug/master

Upstream update