junctions and stuff
Merge branch 'master' of github.com:bbcf/bbcflib