Merge pull request #1 from r3/master

Test wrapper
Merge pull request #2 from r3/master

Decorator
Update todo.txt
Fixed several bugs in decorator, implemented generator that feeds urls. Not
entirely sure that it works properly. I'll wire it into the rest of the
program and have a look.