optimized code.
modified a value of return.
Merge branch 'dev'