Removed completed item from TODO; minor code simplification
Merge pull request #13 from rod-hynes/master

Removed completed item from TODO; minor code simplification