More improvmements
Merge branch 'master' of https://github.com/lyokofirelyte/WC