Resolved issue #63