Merge pull request #13 from fahadiqbal1/master

Master -> hotfix
Merge pull request #14 from fahadiqbal1/hotfix

Merge pull request #13 from fahadiqbal1/master