Removed the scala-version-specific code.
Added cross scala version 2.10.0