Bug fix and libraries upgrade