Fixed version

A lot of corrections since the last version, the merge function was
creating problems when adding the activity names