Resolved issue #19