Merge pull request #4 from harshhpareek/master

Merge
blah
Merge remote-tracking branch 'nazneen/master'
Bug fixes