Merge pull request #19 from r000n/staging

Merging combined changes from r000n.
Grammar, formatting, and clarification of intent.