Merge pull request #102 from mreist/Jay

Merge pull request #101 from mreist/master
Merge pull request #103 from mreist/master

Merge pull request #102 from mreist/Jay