Updated to scala 2.11