Improved merging again a bit and added more docs