fix scala 2.10.0
Merge branch 'master' into feature/kmv
fix BitSet