Some fine-tuning
Merge branch 'master' of https://github.com/PoroCYon/bfc.git