Merge pull request #3 from ksolkowski/John

John
tiny tweaks
Merge branch 'master' into John