Fixed two bugs
Merge pull request #13 from cheekujodhpur/master

Fixed two bugs