Merge pull request #27 from seavor/jay

update