fixes in features
Merge branch 'master' of https://github.com/KernelCorp/yufu
two features left to fix
Merge remote-tracking branch 'origin/master'