Closed #12
Closed #4