Merge branches 'version3' and 'asd44' into version3