Feature/upgrade scala 2.11.4