Change to scala 2.11