ADD LINE ABCD
Merge branch 'master' of github.com:monieo/yafan-fan and fix conflict