Pulled changes in lib/