Fixed #8
Fixed #7