Fix compilation for Scala 2.11
Merge pull request #217 from radekm/fix-for-scala-2.11

Fix compilation for Scala 2.11