Closed #83
Closed #60