Upgraded project to Scala 2.11