Merge pull request #613 from youyong205/master

refactor the code
refactor
resolve conflicts
Merge pull request #614 from jialinsun/master

	refactor
meger