Made compatible with scala 2.10
Made compatible with scala 2.10