fixing bugs
Merge pull request #1 from vireshas/master

fixing bugs