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

	refactor