Merge pull request #1 from szainmehdi/testing

Finalized v1.0