fix
added trigger-add-feedback
added trigger-add-feedback
added trigger-add-feedback
merged master