Inlining #2
Merge pull request #816 from abhinavc/master

Inlining #2