bug fix of return
Merge branch 'develop'