Closed #7
Closed #8