Add tasks for issue #15