Scala 2.11
Merge pull request #64 from xuwei-k/scala2.11

Scala 2.11