Fixed feedback output location.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Made bug fixes.