Merge pull request #12 from akhotan10/master

Ashkaan's request
Merge pull request #13 from akhotan10/AshkaanTest

Merge pull request #12 from akhotan10/master