Synchronized some methods & implemented synchronized FileMap
Merge branch 'task3' into task4