Marked issue63 as complete ... tentatively. Added issue64 to cover debug
Merge branch 'issue63' into develop