Update the lib from master