migrate to scala 2.10