feedback 12 & 13 fixes
Merge pull request #22 from jayprakashj/master

feedback 12 & 13 fixes