Closed #46. Closed #48