fix bug program terminate after answer
Merge branch 'develop'