Merge pull request #4 from mreist/Jay's-Branch

Jay's branch