Merge pull request #45 from DrMarcII/master

Minor cleanup.