The branch used for fixing the conflicts in PR#38 by Javier