Merge pull request #1 from KISRDevelopment/master

merging upstream to master
added my name Nasser Hussain
Merge pull request #24 from Nasser-Bader/amend-my-name

Amend my name