lot of changes
Merge branch 'master' of https://github.com/Snaquaza/Test