Merge pull request #98 from SGover/Adeeltariq-alpha

Merge pull request #97 from SGover/master
Merge pull request #99 from SGover/master

Merge pull request #98 from SGover/Adeeltariq-alpha