Fix.
Merge branch 'em2' into nanoporeHacks