Added missing throws declarations
Fixed synchronization
Line ordering
Merge branch 'task7' into task9