Resolved issue #21