Merge pull request #6 from sunny-mittal/issues

Issues
broken functionality