updated to scala 2.2.1