Resolved issue #36