upgraded to scala 2.10.0
added tests