Merge pull request #377 from martinbudden/bf_tasks