fix merge
Merge branch 'master' of github.com:gtfierro/patentprocessor