Move to scala 2.10