Fixing travis build.
Changes after Paul comments
Merge branch 'master' into iSpreadRanking