upgraded to scala 2.10