Merge branches 'patch/small-test-api', 'patch/router' and 'patch/readme'