* Start to address bug #5
references #5