Made minor changes based on feedback
Merge remote-tracking branch 'niloa-master/master'
Merge pull request #26 from bsharanya/master

Minor changes based on feedback