minor bugfix to ensure rspec passes
Merge branches 'master' and 'testing'