merge fix
Merge branch 'master' of https://github.com/treangen/metAMOS

Conflicts:
	src/utils.py