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

feedback 12 & 13 fixes