BP-17: fixing accidental commit
Merge branch 'master' of https://github.com/dudewad/BPeterson