Fixes...
All fixed.
Merge branch 'new_branch' into task-5
Fixes after Junit review
Checkstyle
Merge branch 'task-5' into task-6
Fixes after JUnit review