Resolved issue #54