Updated with latest version of library