Added lazy loading
Merge branch 'master' of https://github.com/naomihimley/PubChatter