Merge pull request #24 from seavor/jay

minor fixes