Changes to address Issue #12