Closed #18
Closed #19