Closed #24
Closed #18