Issue #16 Todo was removed