Merge pull request #368 from GaryKeeble/blackbox-enhancements