Created issue #17 for the task mentioned in TODO