some fixes .. :-D
Merge pull request #1 from rutvik95/patch-1

some fixes .. :-D