Finishing implementation for an Issue #58