Getting rid of some code smells
Merge pull request #14 from Scissr/development

Getting rid of some code smells