Adjusted for coverage and pep8
Merge pull request #14 from jamiecurle/add-coverage

Adjusted for coverage and pep8