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

feedback 7 fixes