Merge pull request #85 from seavor/jay

fixed everything