Merge branch 'wikipedia-api-integration'