addcontext feature complete, issue #21