Oops, do not return new_context just yet, update and then return
Merge pull request #15 from mjtorn/master

Unnecessarily early return to be fixed