R0342018
Merge pull request #22 from luck60915/master

R0342018