feedback 8 fixes
Merge pull request #9 from jayprakashj/master

feedback 8 fixes