Closed #100
Closed #98