Switched to Scala 2.10