Merge pull request #759 from martinbudden/bf_tidy_targets