Fixed #9
Fixed #8