Scala 2.10.2
Fix tests
Merge branch 'danielkza-0.3' into 0.3
travis 2.10.2