Updated library

Library updated with recent modifications