Potential bugfix
Merge branch 'master' of https://github.com/jgruselius/bravo-protocols

Minor adjustments after testing capture