Fix scala 2.10 snafu and add doc