Fixed return issue, do not return last line break
Merge branch 'fixReturn'