latest feedback 9 fixes
Merge pull request #13 from jayprakashj/master

latest feedback 9 fixes