Bug fix Issue #32
Update todo features