1/gyq part 3
Merge pull request #807 from abhinavc/master

1/gyq part 3