Optimize content load.
Merge pull request #522 from gsn/master

Optimize content load.