Recovering Derek's edits
Merge pull request #58 from cloudsleuth/master

Recovering Derek's edits