committing from fork
Merge pull request #1 from shamsaabid/master

pull up these changes to myrepo