Merge pull request #2 from stripathy/master

pull request
Merge pull request #2 from cyrus-/master

asdf