Revert "good and bad"
Merge pull request #21 from ivanbrennan/revert-20-development

Revert "good and bad"