Merge pull request #1 from olvap/master
Merge pull request #2 from olvap/master

Passing tests.
Setting initial values.
Show all and todo tasks