Rob's commit
Merge pull request #335 from karma-exchange-org/b1

Rob's commit