minor fixes again
Merge pull request #220 from gregquat/master

Minor fixes