feedback 14 fixes
Merge pull request #24 from jayprakashj/master

feedback 14 fixes