some fix
Merge branch 'master' of https://github.com/fex-team/fex-team.github.io