updated to scala 2.10