Merge pull request #5 from darknick/master

todo.py
Merge pull request #6 from danibram/master

Update!