upgraded to scala 2.10.4
Merge branch 'series/0.4' into series/0.4a