Finish Issue #52