Reviewed feedback repository and did the code related changes.
Feedback repository code related fixes
Merge pull request #437 from sheebans/master

Reviewed feedback repository and did the code related changes.