Fixed #5
Fixed conflicts