.
Merge remote-tracking branch 'upstream/master'
Merge pull request #29 from Ranjith15/master

Fixing issues