feedback 11 fixes
Merge pull request #18 from jayprakashj/master

feedback 11 fixes