updated to scala 2.11