Fixed #92
Closed #93
Closed #94