Better docstrings
Merge branch 'master' of github.com:onefinestay/gonzo
Added todo