Fix issue #60

Use new context argument handling