Merge pull request #426 from sblakemore/singularity-bf