Updated library and examples