Upgraded to Scala 2.10