Resolved issue #103