Updated to scala version 2.10