Added new version of feedback
Merge remote-tracking branch 'origin/master'