Fixed #97
Fixed #50