Fixed merge + coverall

And added coveralls