Fixed #7
Fixed #5