merged metanome master into this fork