Added Scala 2.10 support

Removed two deprecation warnings