Merge pull request #1 from daljeetss/hotfix

Hotfix
Merge pull request #2 from djProd/master

Merge pull request #2 from daljeetss/master