Resolved issue #14