Closed #44
Closed #45