Port to scala 2.10.0