Closed #36
Closed #49