feedback 12 fixes
feedback 12 fixes
Merge pull request #19 from jayprakashj/master

feedback 12 fixes