fixes #9 and fixes #10
Merge pull request #11 from Janarthanam/master

fixes #9 and fixes #10