Merge pull request #13 from mreist/master

Getting Master
Merge remote-tracking branch 'origin/Jay's-Branch' into Nick's-Branch