Closed #36
Opened #53