Improve prompt
Merge branch 'improve-prompt'
Bump up version and update Changes