Updated to 2.10
Fixed deprecation and feature warnings