Issue #44 removed @todo puzzle comment for the resolution of this issue.