merge in master. migrate to scala 2.10