Ugrade to scala 2.10.4