Merge pull request #39 from jimsch/master

Match the changes from updated Context structure