upped to scala 2.10