Merge pull request #7 from DrMarcII/master

Fix some minor errors.