todos fixed

[Todos] Closed issue #17