fix scala 2.10.2 warnings
Merge pull request #128 from jimkont/fix_warnings

fix scala 2.10.2 warnings
Merge branch 'master' into live