Fixed lint errors
Merge branch 'master' into evaluation