Bwp 0.8.5

@jblock mind taking a look?