Answered some of Stef's questions, some minor edits
Merge pull request #6 from svenvc/patch-1

Answered some of Stef's questions, some minor edits