Resolved issue #34