Updated to Scala 2.11