companion update, minor update
Merge pull request #313 from jpecht/master

companion update, minor update