Fix #27 2.0 - Thanks @humangenome