updated to Scala 2.10