migrated to Scala 2.11