Updated to stable 1.x