Closed #43, #46