Make B-A and B-F work
fix compile warning (missing return)
Merge branch 'master' of github.com:fachat/XD2031