Closed #64
Closed #63
Closed #65