todos

[Todos] Closed issue #22