Merge pull request #110 from mreist/master

Getting Master
Fancy Bob!
Merge pull request #111 from mreist/Jay

Jay