some fixes
Merge pull request #3 from rutvik95/master

some fixes