Merge pull request #1 from sarthakmunshi/master

Master
updated
Merge pull request #2 from sarthakmunshi/master

updated
removed shit
Licensing
updated