Update of library since commit 8f90086583