Completed bug116 - ISSUE #68 -