Updated library and sample project to version 2.0