issue #16 Resolved Files