Upgraded to Scala 2.11