Update todo, try to fix ReadTheDocs problem
Merge branch 'release/v0.3.1'