Scala 2.10.4
Merge pull request #69 from gkossakowski/2.10.4

Scala 2.10.4