Merge pull request #35 from mreist/Jay

Jay