Updated to Scala v 2.11