Merge pull request #93 from SGover/Adeeltariq-alpha

Adeeltariq alpha
bug fix
gui changes

Signed-off-by: Adeel <adeeltariqagain@gmail.com>