Updated to use Scala 2.10.0