Fixed #7
Fixed #3