wip - scala 2.11 support