Merge pull request #72 from mreist/Jay

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