Merge pull request #16 from fahadiqbal1/dev

Dev
Merge pull request #17 from fahadiqbal1/hotfix

Merge pull request #16 from fahadiqbal1/dev