updated to Scala 2.11