Minor update
Implementation for an Issue #7
New file added for Issue #7