Resolved issue #105