Do you think you can finish this by next week? Otherwise I'm thinking of releasing 0.6.1 without these changes, as we need to have a synchronized documentation with the provy version that was released.