Changes to compile version 0.7.1 for scala 2.11.
Merge remote-tracking branch 'origin/master'