Resolved issue #17.