merging waqas branch
Merge pull request #4 from MustafaDasorwala/Waqas-Branch

merging waqas branch