Merge branch 'doyaGu-master' into dev