BeFeW v0.5.1 - Fix and improve