Fixed #59
Fixed #57