Merge pull request #43 from mreist/master

Merging jay to master
Merge remote-tracking branch 'origin/master' into Jay
Merge pull request #50 from mreist/Jay

Jay