Fixes #358
Merge pull request #359 from pencilblue/issue/PB358

Fixes #358