Updated to scala 2.10