Merge pull request #69 from chrisdennis/issue-32

Merge changes for issue #32
Tests will be created when configuration parsing logic is reworked.