Added delimiter handling to Calculator