Merge branch 'issue-54'

* issue-54:
  Restore context correctly