Closed #54
Closed #53