Merge pull request #1 from szainmehdi/testing

Finalized v1.0
Merge pull request #2 from szainmehdi/master

Merge pull request #1 from szainmehdi/testing