fix refactor
Merge branch 'master' of github.com:TopClubCompany/developers