Upgraded to scala 2.10