Merge pull request #2 from mattseburn/feature-bobcat-386

Feature bobcat 386
addition for bobcat-123
Merge pull request #3 from mattseburn/feature-bobcat-123

addition for bobcat-123
bobcat-386 bugfix