Updated for BSP v1.0.0

Closed feature request #2