fixed some stuff and changed file4
Merge branch 'develop' of github.com:xclose/test into develop