Resolved issue #72