Merge pull request #12 from akhotan10/master

Ashkaan's request