1/gyq part 2
Merge pull request #806 from abhinavc/master

1/gyq part 2