updated to 2.x, created 1.x branch for history