adding displaying feedback
Merge branch 'master' into DisplayFeedback