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

Jay's branch
Merge pull request #10 from mreist/Nicks-Branch

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