Fixed #8
Fixed #7
Fixed #6