Merge pull request #106 from mreist/Jay

Order of Ops
Merge pull request #107 from mreist/master

Merge pull request #106 from mreist/Jay