Updated for scala 2.10 and Scoobi 0.7