Updated to master on libraries