Fixed #86
Fixed #87
Closed #88