Updated 3rd party libs and fixed #36