Editing electronic dive files

I have a Oceanic Veo 2.0 that I am pretty happy with. The Oceanlog software is okay but there a few things it will not do that are annoying. One of those is there is no ability to edit a dive that has been downloaded from the computer. There is also no ability to combine dives if the surface interval starts a new dive. If you take to long planning what your next move after surfacing it starts a new dive.

You can export a dive as a Dan7 format and reimport it. Has anyone found a way combine dives using the Dan7 format or seen a guide to the format of the Dan7 format?

Oceanic actually encrypts each file when you download it off the computer.