Closed #225
Closed #230