Update for scala 2.10

Hi, I wonder why @aleksandersumowski doesn't propose a pull-request for an update, so I adjusted a bit his fork and suggest to merge this update of the library for scala-2.10.