Add partial support for Scala 2.10 (partial #6)