OR context selection added, resolved #43