Updated to Scala-2.10