Merge pull request #35 from mreist/Jay

Jay
Merge pull request #36 from mreist/master

Merge pull request #35 from mreist/Jay