Adjusted code to fix bug noted in Ticket 8
Merge remote-tracking branch 'origin/jrn_8'