Updated version of library and example