modified Tim's branch
Issue resolved

Issue has been resolved
Modified branch
resolved