Now compiling with Scala 2.11