Make all tests green
Improve documentation
Merge pull request