Update to scala 2.10