Updated to build with Scala 2.11.