some more todos
Merge branch 'master' of github.com:silverbucket/teste