Updated example and improved library