haroon_dev #341

Closed
Haroon6138 wants to merge 7 commits from haroon_dev into master