Merge pull request #59 from arvind-naidu/master

fixed issue #32
Merge pull request #60 from arvind-naidu/master

Revert "fixed issue #32"