merged with develop and compiling with scala 2.10