Merge pull request #101 from mreist/master

Getting Master
Merge pull request #102 from mreist/Jay

Merge pull request #101 from mreist/master