updated some stuff
Merge branch 'master' of https://github.com/lolesco/new2.git