Merge pull request #1 from KISRDevelopment/master

Merging upstream to master
added more info to my name
Merge pull request #19 from hackfoo/amend-my-name

Amend my name