Fixat everything

lsaolasdl
Merge branch 'master' into vz