concepts now take contexts into account, resolved #12