Resolved issue #12