Merge pull request #1 from yk-twww/devel

Devel
Merge pull request #2 from yk-twww/devel

Devel
from q3.1 to q3.8