Code for Enhancement to Issues List

Code for Issue #18