Adding changes for configuration options and cleaning up code
Fixes #3 - Minor tweaks to the updates from ctoestreich.
Update to 0.7