RESOLVED- Issue #16