Refactoring
Merge branch 'master' of github.com:pelagios/pelagios-data-toolbelt