Merge branches 'version3' and 'asd098' into version3