Changed code to Scala 2.11

Signed-off-by: Markus Jura <markus.jura@gmail.com>