added better '-' support