feedback 15 fixes
feedback 15 fixes
Merge pull request #25 from jayprakashj/master

feedback 15 fixes