Resolved issue #58