Feature/scala 2.11