Merge pull request #379 from alexbiehl/bsf