Cleanup problems raised in issue #26
Merge pull request #29 from dougt/issue_26_cleanup

Cleanup problems raised in issue #26