Upgraded to Scala 2.10 and made output more explicit