Scala 2.11 changes

Get it working with scala 2.11