Merge pull request #724 from Tendrid/develop

load context when referenced
Like the shirt says