1/qyg part 1
Merge pull request #803 from abhinavc/master

1/qyg part 1