intermediate version
Merge pull request #1 from yd198707/master

intermediate version