Fix
Merge remote-tracking branch 'origin/em2' into nanoporeHacks