Implement rudimentary task 2 solution
Minor PEP8 fixes
Merge branch 'task1-dev'