Fixed Checkstyle
Merge branch 'eduard-final-1'
Merge branch 'master' into eduard-final-1