code climate
Merge branch 'hotfix/codeclimate'