Changed to Scala 2.10
Merge remote-tracking branch 'origin/master'