catching master up to latest libs