Review comments on the PR for scala 2.10 migration.
Merge pull request #260 from ScrapCodes/scala-2.10

Review comments on the PR for scala 2.10 migration.