refactoring
Merge branch 'master' into patent_indexer