Closes #23. Fixed indentation, reduced complexity, and added missing test case
Merge pull request #31 from ckaznocha/feature/issue23

Closes #23. Fixed indentation, reduced complexity, and added missing tes...