Fixed #81
Fixed #87
Fixed #80