Merge pull request #518 from stianst/master

Lazy load connections