Merge pull request #37 from DrMarcII/master

Minor fixes